From eb50dec803774a63e7e49b214f71424d27babdf6 Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Wed, 10 Jun 2020 05:20:08 -0600 Subject: [PATCH] Adjust gdb reader duration handling (#595) * experiment with filtering gdb waypoints. * formalize new gdb option to avoid creation of waypoints from non-user points. Also, don't fill in the description when processing durations. This interacted undesirably with the roadbook option. * fix reference files. * simplify bool option processing in gdb, new ref files. * fix reference files again. * contrast the gdb dropwpt option with the via option --- gdb.cc | 44 +-- gpx.cc | 6 +- reference/format3.txt | 2 + reference/gdb-sample-v3-autoroute.gdb | Bin 1767 -> 12439 bytes reference/gdb-sample-v3-autoroute.gpx | 348 ++++++++++++++++++++---- reference/help.txt | 1 + testo.d/gdb.test | 2 +- xmldoc/formats/options/gdb-dropwpt.xml | 5 + xmldoc/formats/options/gdb-roadbook.xml | 4 +- xmldoc/formats/options/gdb-via.xml | 2 +- 10 files changed, 326 insertions(+), 88 deletions(-) create mode 100644 xmldoc/formats/options/gdb-dropwpt.xml diff --git a/gdb.cc b/gdb.cc index 034230042..c8a331421 100644 --- a/gdb.cc +++ b/gdb.cc @@ -85,7 +85,10 @@ static char gdb_release_date[] = "$Date: 2011-04-14 01:30:01 $"; static gbfile* fin, *fout, *ftmp; -static int gdb_ver, gdb_category, gdb_via, gdb_roadbook; +static int gdb_ver, gdb_category; +static bool gdb_roadbook; +static bool gdb_hide_wpt; +static bool gdb_hide_rpt; static QList wayptq_in, wayptq_out, wayptq_in_hidden; static short_handle short_h; @@ -95,6 +98,7 @@ static char* gdb_opt_ver; static char* gdb_opt_via; static char* gdb_opt_roadbook; static char* gdb_opt_bitcategory; +static char* gdb_opt_drop_hidden_wpt; static int waypt_flag; static int route_flag; @@ -295,7 +299,7 @@ gdb_add_route_waypt(route_head* rte, Waypoint* ref, const int wpt_class) } Waypoint* res = nullptr; int turn_point = (gdb_roadbook && (wpt_class > gt_waypt_class_map_point) && !tmp->description.isEmpty()); - if (turn_point || (gdb_via == 0) || (wpt_class < gt_waypt_class_map_point)) { + if (turn_point || !gdb_hide_rpt || (wpt_class < gt_waypt_class_map_point)) { res = new Waypoint(*tmp); route_add_wpt(rte, res); } @@ -597,9 +601,6 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out) res->description = FREAD_CSTR_AS_QSTR; /* instruction */ if (wpt_class == gt_waypt_class_map_intersection || wpt_class == gt_waypt_class_map_line) { garmin_fs_t::set_duration(gmsd, duration); - if (res->description.isEmpty()) { // - res->description = res->shortname; - } res->notes = QString("[%1]").arg(gdb_to_ISO8601_duration(duration)); #if GDB_DEBUG DBG(GDB_DBG_WPTe, 1) @@ -1000,11 +1001,11 @@ gdb_rd_init(const QString& fname) wayptq_in.clear(); wayptq_in_hidden.clear(); - gdb_via = (gdb_opt_via && *gdb_opt_via) ? atoi(gdb_opt_via) : 0; - gdb_roadbook = (gdb_opt_roadbook && *gdb_opt_roadbook) ? atoi(gdb_opt_roadbook) : 0; - if (gdb_roadbook) { /* higher priority */ - gdb_via = 1; - } + bool via = gdb_opt_via; + bool drop_wpt = gdb_opt_drop_hidden_wpt; + gdb_roadbook = gdb_opt_roadbook; + gdb_hide_wpt = via || drop_wpt || gdb_roadbook; + gdb_hide_rpt = via || gdb_roadbook; waypt_ct = 0; waypth_ct = 0; @@ -1057,7 +1058,7 @@ read_data() switch (typ) { case 'W': wpt = read_waypoint(&wpt_class); - if ((gdb_via == 0) || (wpt_class == 0)) { + if (!gdb_hide_wpt || (wpt_class == 0)) { waypt_add(wpt); auto* dupe = new Waypoint(*wpt); wayptq_in.append(dupe); @@ -1805,34 +1806,33 @@ write_data() /*******************************************************************************/ -#define GDB_OPT_VER "ver" -#define GDB_OPT_VIA "via" -#define GDB_OPT_CATEGORY "cat" -#define GDB_OPT_BITCATEGORY "bitscategory" -#define GDB_OPT_ROADBOOK "roadbook" - static QVector gdb_args = { { - GDB_OPT_CATEGORY, &gdb_opt_category, + "cat", &gdb_opt_category, "Default category on output (1..16)", nullptr, ARGTYPE_INT, "1", "16", nullptr }, { - GDB_OPT_BITCATEGORY, &gdb_opt_bitcategory, "Bitmap of categories", + "bitscategory", &gdb_opt_bitcategory, "Bitmap of categories", nullptr, ARGTYPE_INT, "1", "65535", nullptr }, { - GDB_OPT_VER, &gdb_opt_ver, + "ver", &gdb_opt_ver, "Version of gdb file to generate (1..3)", "2", ARGTYPE_INT, "1", "3", nullptr }, { - GDB_OPT_VIA, &gdb_opt_via, + "via", &gdb_opt_via, "Drop route points that do not have an equivalent waypoint (hidden points)", nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr }, { - GDB_OPT_ROADBOOK, &gdb_opt_roadbook, + "dropwpt", &gdb_opt_drop_hidden_wpt, + "Don't create waypoints for non-user points", + nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr + }, + { + "roadbook", &gdb_opt_roadbook, "Include major turn points (with description) from calculated route", nullptr, ARGTYPE_BOOL, ARG_NOMINMAX, nullptr }, diff --git a/gpx.cc b/gpx.cc index cd7059177..2fc109fff 100644 --- a/gpx.cc +++ b/gpx.cc @@ -1621,11 +1621,7 @@ GpxFormat::write() gpx_reset_short_handle(); auto gpx_waypt_pr_lambda = [this](const Waypoint* waypointp)->void { - auto* gmsd = garmin_fs_t::find(waypointp); /* gARmIN sPECIAL dATA */ - auto wc = garmin_fs_t::get_wpt_class(gmsd, 0); - if (wc != gt_waypt_class_map_intersection && wc != gt_waypt_class_map_line) { - gpx_waypt_pr(waypointp); - } + gpx_waypt_pr(waypointp); }; waypt_disp_all(gpx_waypt_pr_lambda); gpx_reset_short_handle(); diff --git a/reference/format3.txt b/reference/format3.txt index 937f29a12..643a1c7a3 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -360,6 +360,8 @@ option gdb ver Version of gdb file to generate (1..3) integer 2 1 3 https://www. option gdb via Drop route points that do not have an equivalent waypoint (hidden points) boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_via +option gdb dropwpt Don't create waypoints for non-user points boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_dropwpt + option gdb roadbook Include major turn points (with description) from calculated route boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_roadbook file rwrwrw garmin_txt txt Garmin MapSource - txt (tab delimited) garmin_txt diff --git a/reference/gdb-sample-v3-autoroute.gdb b/reference/gdb-sample-v3-autoroute.gdb index 01764df71e40e45b3cf270a8cf401a56d2caf289..b7dddddbd671f50fc65ffbc2bb33ffa32a625795 100644 GIT binary patch literal 12439 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 literal 1767 zcmah~O-vI(6n+azVj(7Kgqs~gJORn>QfY!Q*;ddPttL<;#)P=gMK+c#Zd;U#a3jXR z$%7sZ(ZEe_deWN*4`@92cQHl}9*l7EVuJ6R{p+@X({$#|>zntz|K`fWlT*}0M1wPQ zjE~F%Wuj^q3-ffwnh=^MbX8YLQwP+(0qq23&9ZgcoSCKDEIX#Eszz;0QD^>WqlT(4G#1E`Jyu$;cDQ z3>FcnOPtIVP9{Y!5+l`O(VjCMk-z2ih}=+*P*eT=sU9KKAnkB}nZLD?lp6v@qzAWX zDaOm!M-j4T0W0#oRf5%t8avoMGmJe%^@{1fJ-BQ$dCd z;{ko!B5(T{B~tD;ZrH&)5slI@1NNQ_2slOr3}}`H?1RINxNRKHG{Wikwl5?j3>G3B z!`*vA02iYoavbT2l!qvrtot2se=_j~#1AH3F%dL-&9jgdvt-Yau}h*uO<~VSJlQ>9 zVan9_TUUN?C0@AT1V-WXi>tB9ASnMoJSkicf<=m4xF16BZk|efSlzs8G<7eve_EL| j&ZqBYt{u0H)vgzRmr}Dv_xh2ygU?+959C7mUMA%qGr - - - - 7 Manor Ln - 7 Manor Ln -Sullivan Twn, ME, 04664, USA - 7 Manor Ln -Sullivan Twn, ME, 04664, USA - Flag, Blue + + + + Birch Harbor + Birch Harbor + Birch Harbor + City (Small) - - - Acadia Bay Inn - Acadia Bay Inn -12 Miramar Ave -Sullivan Twn, Maine, 04664, United States -207-422-0127 - Acadia Bay Inn -12 Miramar Ave -Sullivan Twn, Maine, 04664, United States -207-422-0127 - Lodging + + + Gouldsboro + Gouldsboro + Gouldsboro + City (Small) + + + + Schoodic Woods Campground + Schoodic Woods Campground +Schoodic Loop Rd +Winter Harbor Twn, Maine, 04693, United States +207-288-1300 + Schoodic Woods Campground +Schoodic Loop Rd +Winter Harbor Twn, Maine, 04693, United States +207-288-1300 + Campground + + + + Sullivan Twn + Sullivan Twn + Sullivan Twn + City (Small) - 7 Manor Ln to Acadia Bay Inn - - - 7 Manor Ln - 7 Manor Ln -Sullivan Twn, ME, 04664, USA - 7 Manor Ln -Sullivan Twn, ME, 04664, USA - Flag, Blue + Trip to Schoodic Woods Campground - Day 1 + + + Sullivan Twn + Sullivan Twn + Sullivan Twn + City (Small) - - 37.273 + + 45.738 0001 - Get on Manor Ln and drive south - [PT2S] + Get on Us1 and drive east + [PT6S] Waypoint - - 37.160 + + 45.563 0002 - Turn left onto Us1 - [PT1M27S] + [PT23S] Waypoint - - 40.863 + + 44.266 0003 - Turn right onto Miramar Ave - [PT54S] + [PT2M3S] Waypoint - - 40.180 + + 28.781 0004 - 0004 + [PT1M28S] + Waypoint + + + 26.887 + 0005 + [PT1M21S] + Waypoint + + + 20.605 + 0006 + [PT1M52S] + Waypoint + + + 38.840 + 0007 + Turn right onto S Gouldsboro Rd + [PT3M4S] + Waypoint + + + 34.777 + 0008 + [PT2M12S] + Waypoint + + + 38.371 + 0009 + [PT3S] + Waypoint + + + 38.293 + 0010 + [PT1M29S] + Waypoint + + + 36.547 + 0011 + [PT1M11S] + Waypoint + + + 24.645 + 0012 + [PT1M3S] + Waypoint + + + 15.426 + 0013 + [PT49S] + Waypoint + + + 11.945 + 0014 + [PT1M1S] + Waypoint + + + 9.000 + 0015 + Turn left onto Main St + [PT1M35S] + Waypoint + + + 15.344 + 0016 + [PT23S] + Waypoint + + + 21.840 + 0017 + Turn right onto Moore Rd + [PT1M37S] + Waypoint + + + 41.480 + 0018 + [PT0S] + Waypoint + + + + Schoodic Woods Campground + Schoodic Woods Campground +Schoodic Loop Rd +Winter Harbor Twn, Maine, 04693, United States +207-288-1300 + Schoodic Woods Campground +Schoodic Loop Rd +Winter Harbor Twn, Maine, 04693, United States +207-288-1300 + Campground + + + 41.480 + 0019 + Get on Moore Rd and drive north + [PT1M16S] + Waypoint + + + 21.840 + 0020 + Turn right onto Birch Harbor Rd + [PT1M13S] + Waypoint + + + 29.652 + 0021 + [PT1M39S] + Waypoint + + + 29.453 + 0022 + [PT0S] + Waypoint + + + 29.453 + 0023 + [PT0S] + Waypoint + + + + 1 Birch Harbor Rd + 1 Birch Harbor Rd +Winter Harbor, ME, 04693, USA + Flag, Blue + + + 29.453 + 0024 + [PT0S] + Waypoint + + + 29.453 + 0025 + [PT6M9S] + Waypoint + + + 29.652 + 0026 + [PT18S] + Waypoint + + + 21.840 + 0027 + [PT31S] + Waypoint + + + 15.344 + 0028 + [PT51S] + Waypoint + + + 9.000 + 0029 + Turn right onto Newman St + [PT1M27S] + Waypoint + + + 11.945 + 0030 + [PT49S] + Waypoint + + + 15.426 + 0031 + [PT1M3S] + Waypoint + + + 24.645 + 0032 + [PT1M11S] + Waypoint + + + 36.547 + 0033 + [PT1M29S] + Waypoint + + + 38.293 + 0034 + [PT3S] + Waypoint + + + 38.371 + 0035 + [PT2M12S] + Waypoint + + + 34.777 + 0036 + [PT2M16S] + Waypoint + + + 38.840 + 0037 + Turn right onto Us1 + [PT1M15S] + Waypoint + + + 36.152 + 0038 [PT0S] Waypoint - - - Acadia Bay Inn - Acadia Bay Inn -12 Miramar Ave -Sullivan Twn, Maine, 04664, United States -207-422-0127 - Acadia Bay Inn -12 Miramar Ave -Sullivan Twn, Maine, 04664, United States -207-422-0127 - Lodging + + + Post Office-Gouldsboro + Post Office-Gouldsboro +411 Route 1 +Gouldsboro Twn, Maine, 04607, United States +207-963-7148 + Post Office diff --git a/reference/help.txt b/reference/help.txt index ab2aa7499..3fdad3b64 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -188,6 +188,7 @@ File Types (-i and -o options): bitscategory Bitmap of categories ver Version of gdb file to generate (1..3) via (0/1) Drop route points that do not have an equivalent w + dropwpt (0/1) Don't create waypoints for non-user points roadbook (0/1) Include major turn points (with description) from garmin_txt Garmin MapSource - txt (tab delimited) date Read/Write date format (i.e. yyyy/mm/dd) diff --git a/testo.d/gdb.test b/testo.d/gdb.test index 05aa812b5..dc8f003e5 100644 --- a/testo.d/gdb.test +++ b/testo.d/gdb.test @@ -27,5 +27,5 @@ gpsbabel -i gdb,via -f ${REFERENCE}/gdb-sample-v3.gdb -o gpx -F ${TMPDIR}/gdb-sa compare ${REFERENCE}/gdb-sample.gpx ${TMPDIR}/gdb-sample_v3.gpx # don't choke if autoroute information is present. -gpsbabel -i gdb -f ${REFERENCE}/gdb-sample-v3-autoroute.gdb -o gpx -F ${TMPDIR}/gdb-sample-v3-autoroute.gpx +gpsbabel -i gdb,dropwpt -f ${REFERENCE}/gdb-sample-v3-autoroute.gdb -o gpx -F ${TMPDIR}/gdb-sample-v3-autoroute.gpx compare ${REFERENCE}/gdb-sample-v3-autoroute.gpx ${TMPDIR}/gdb-sample-v3-autoroute.gpx diff --git a/xmldoc/formats/options/gdb-dropwpt.xml b/xmldoc/formats/options/gdb-dropwpt.xml new file mode 100644 index 000000000..fc123f13c --- /dev/null +++ b/xmldoc/formats/options/gdb-dropwpt.xml @@ -0,0 +1,5 @@ + +This option instructs GPSBabel to drop hidden (calculated) points from +routes when creating waypoints. These points are not converted to waypoints, but they are converted to route points. + + diff --git a/xmldoc/formats/options/gdb-roadbook.xml b/xmldoc/formats/options/gdb-roadbook.xml index 296d7b03f..c1ef6cfe4 100644 --- a/xmldoc/formats/options/gdb-roadbook.xml +++ b/xmldoc/formats/options/gdb-roadbook.xml @@ -1,8 +1,8 @@ If this option is specified, GPSBabel drops all calculated route points, with exception of points with a description (i.e. "Make U-turns until you know where you are."). - The priority of this option is higher than of the option. - A value of 1 or y overwrites the settings. + The priority of this option is higher than of the and options. + A value of 1 or y overwrites the and settings. Using gdb option <option>roadbook</option> to create simple html roadbook diff --git a/xmldoc/formats/options/gdb-via.xml b/xmldoc/formats/options/gdb-via.xml index 0df42530c..ce782b56a 100644 --- a/xmldoc/formats/options/gdb-via.xml +++ b/xmldoc/formats/options/gdb-via.xml @@ -1,5 +1,5 @@ This option instructs GPSBabel to drop hidden (calculated) points from -routes. +routes. These points are not converted to waypoints or route points. -- 2.30.2